bitkeeper revision 1.1159.1.322 (41865b3esLMCK45rPPwl2IDgdedolA)
authorach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Mon, 1 Nov 2004 15:50:22 +0000 (15:50 +0000)
committerach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Mon, 1 Nov 2004 15:50:22 +0000 (15:50 +0000)
commit6624a9cfafcaed117d40d5e6ae1ff272cce92526
tree17423c07bb2f7a81fe62c47efd09cdb6c714523b
parentecf8f43e65c6b540ca4154ae93efb1453844b1ed
parent25c6b493816c9ba1916f9047363673ef9a75beff
bitkeeper revision 1.1159.1.322 (41865b3esLMCK45rPPwl2IDgdedolA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/ach61/tmp/xeno.bk
xen/arch/x86/pdb-stub.c
xen/arch/x86/traps.c
xen/common/keyhandler.c
xen/drivers/char/console.c
xen/include/xen/sched.h